home *** CD-ROM | disk | FTP | other *** search
GNU Info File | 1995-07-29 | 3.5 KB | 128 lines |
- This is Info file diff.info, produced by Makeinfo-1.55 from the input
- file ./diff.texi.
-
- This file documents the the GNU `diff', `diff3', `sdiff', and `cmp'
- commands for showing the differences between text files and the `patch'
- command for using their output to update files.
-
- Copyright (C) 1992, 1993 Free Software Foundation, Inc.
-
- Permission is granted to make and distribute verbatim copies of this
- manual provided the copyright notice and this permission notice are
- preserved on all copies.
-
- Permission is granted to copy and distribute modified versions of
- this manual under the conditions for verbatim copying, provided that
- the entire resulting derived work is distributed under the terms of a
- permission notice identical to this one.
-
- Permission is granted to copy and distribute translations of this
- manual into another language, under the above conditions for modified
- versions, except that this permission notice may be stated in a
- translation approved by the Foundation.
-
- Indirect:
- diff.info-1: 1001
- diff.info-2: 50219
- diff.info-3: 98878
- Tag Table:
- (Indirect)
- Node: Top1001
- Node: Overview2411
- Node: Comparison5360
- Node: Hunks8045
- Node: Whitespace9470
- Node: Blank Lines10726
- Node: Case Folding11489
- Node: Specified Folding11902
- Node: Brief12992
- Node: Binary14243
- Node: Output Formats16754
- Node: Sample diff Input17446
- Node: Normal18939
- Node: Detailed Normal19868
- Node: Example Normal21593
- Node: Context22316
- Node: Context Format23864
- Node: Detailed Context24559
- Node: Example Context26115
- Node: Less Context27608
- Node: Unified Format28740
- Node: Detailed Unified29441
- Node: Example Unified30425
- Node: Sections31424
- Node: Specified Headings32168
- Node: C Function Headings33715
- Node: Alternate Names34459
- Node: Side by Side35356
- Node: Side by Side Format37495
- Node: Example Side by Side38392
- Node: Scripts39719
- Node: ed Scripts40117
- Node: Detailed ed41312
- Node: Example ed43053
- Node: Forward ed43491
- Node: RCS44253
- Node: If-then-else45463
- Node: Line Group Formats47120
- Node: Line Formats50219
- Node: Detailed If-then-else52206
- Node: Example If-then-else54107
- Node: Comparing Directories55159
- Node: Adjusting Output58274
- Node: Tabs58693
- Node: Pagination60213
- Node: diff Performance60632
- Node: Comparing Three Files62148
- Node: Sample diff3 Input63009
- Node: Detailed diff3 Normal63958
- Node: diff3 Hunks65566
- Node: Example diff3 Normal66852
- Node: diff3 Merging67876
- Node: Which Changes70086
- Node: Marking Conflicts71492
- Node: Bypassing ed73949
- Node: Merging Incomplete Lines75304
- Node: Saving the Changed File76021
- Node: Interactive Merging76631
- Node: sdiff Option Summary77329
- Node: Merge Commands78429
- Node: Merging with patch79565
- Node: patch Input81672
- Node: Imperfect82335
- Node: Changed Whitespace83070
- Node: Reversed Patches83813
- Node: Inexact85397
- Node: Empty Files88751
- Node: Multiple Patches89315
- Node: patch Messages90627
- Node: Making Patches92432
- Node: Invoking cmp95613
- Node: cmp Options96217
- Node: Invoking diff97412
- Node: diff Options98878
- Node: Invoking diff3108880
- Node: diff3 Options109511
- Node: Invoking patch112744
- Node: patch Directories114678
- Node: Backups116472
- Node: Rejects119019
- Node: patch Options119569
- Node: Invoking sdiff124329
- Node: sdiff Options125439
- Node: Incomplete Lines128786
- Node: Projects130409
- Node: Shortcomings131103
- Node: Changing Structure132098
- Node: Special Files133046
- Node: Unusual File Names133851
- Node: Arbitrary Limits134473
- Node: Large Files134902
- Node: Ignoring Changes135774
- Node: Bugs136318
- Node: Concept Index136963
- End Tag Table
-